Feature/minor amendments