Fixed some minor bugs and added prep reorder