Final Push - Fixes & Improvements

Final commit of the project. A few fixed have been implemented to solve
the few issues remaining.