fixing, stuff.
adding some comments