Fixed the issues, added commentary