Removed some warnings and cleaned up comments.