Added more, minor changes