changed naming conventions, fixed functions, completed inits