much bug fix and nerf