Comments done, some fixes left but.. its working