fixed some ordering things