more bugfixing and lowered restlessness :banana: