Fixed getOrder bug and other small changes
Placeholder