made some minor improvements