fixed up the main
#82: fixed