cleaned up some functions, added to-do items