values moving to separate file and some other fixes