updated changelog and slight clean up