little bug fixes and so