Removed commented code.
Fixed some issues.