cleaned up, got tests working