Added functions, comments, renamings.. etc.. maintenance... blah