add overloads

plus more work on constants