main commit
fixed styles
fixed tests, added comments