Increased scaling and fixed various bugs