Update including bug fixes