finalised allnecessary files. working on bug fix