added tests, cleaned up
readme updated