fix-varius-bugs