improve bullets, fix few bugs