fixed multiple small issues