Recent Updates

Combined most recent files together. A lot of bugs have been fixed.