Further feature reduction and bug fixes