updates
some bug fixes