just some simple bug fixes