fixed small issues
partially working