Minor changes and some importing of constants