Mac edit

Initial mac edit, corrected issues found within eclipse