Make constants... constant + fix comments