fixes, crop modes, order and orderby methods, refactoring