fixed thorny scaling issues