Removed redundant locks
Updated TODO, minor changes
updated TODO