Some fixes and setbonus stuff for 0.0.29