Add more constants
Small fixes (low)