bug fixes
temp. rolled back last commit