Fixed bugs with new system.