more house keeping

change to switch statement in main
more prints