updated changelog
variable and code styling tweaks/cleanup