A Bloody Night: Update 2

General improvements