More bugs fixed, NOW it should work...