added vitaue and other minor things