working again - somewhat anyway
styling fixes
more styling cleanup
merge conflict resolution