Removed some TODOs and FIXMEs, master stops threads in finalizer
Added some very very basic comments for classes