Update 1.0.1 + some tweaks by Roach