Added StatusCheck duplication, minor bugfixes