Removed most of the errors and todos (if not all) ;-)