Version 1.5: Added more constants and cleaned up comments