fix stack warning
Add .+ and .- and fix deprecation warnings