commenting code and cleanning errors
working on