More bugfixing

~ checking