just some more bug fixes