Usability and bug fixes
Needed some minor merging