wip
merged mac and luna changes
fixed missing pep8ing
wip
wip