cleaned up comments
now using all legal features