fixed some small issues