somve variables fixes and added some methods