fixed some bugs + adjustments