todo list and small bug fixes