Clean-ups and Updated changelog