yet again fixed some more bugs