bug fixes

attempting to stabalize the app as a whole