test
some bug fixes