added sample problems2, minor cleanup