moved instances and fixed small bugs