More analysis

Made a bunch of small tweaks