All bug fixes

Check it out