some changes, it's working now
cleanup, no tests yet
readme