removed some test code
minor modifications, code still broken