some minor fixes have been made