Changed order and added some minor updates/fixes.