Some minor changes
sdfasdfasfasd
merge
mess cleaned up maybe...
latest and greatest