cleaned up a little bit, compilation problem fixed