Fixed some wrapping issues... again and subtraction operations