Bug fix with removed function
Minor cleanup

Changed some comments, crossed off some todos, fixed some trivial bugs,
consolidated some one-time functions
Deprecated lang folder