App Ready for Testing

completed a few bug fixes to prep for testing.