update todo list and general cleanup