bug fixes. stuff more smoother