Little refinemends, should have added all the necessary constants by now