Jordan - fixed most all the things