Bonus routines
Some fixes