Updated changelog and small bug fixes