Created temporary checker
More fixes
More tweaks.