fixes some small issues