revisions

Added more constants and revised code