Updated Source

added some new functions
Fixed up Save Bats

master should work better.. Still buggy.