More changes
minor changes, starting work on junit reporter