beta seems to work fine
some bug fixes