Added boolean arguments
Commented out some stuff
Added color arguments