cleaned out some functions
fixed class issues