Re-added comments and cleaned up warnings