Misc. Bug Fixes

Mo betta bug fixing.