Cleanup on comments, bug-fix on warnings.