smaller changes, TODO updated