fixed some orderform bugs and changed some inline