Cleaned up comments, added warning