Added more objectives and bug fixes