bumped version no. + minor cleanup