Removed inactive options
cleaned up, made a little more pythonic

should still fix the row function but not going to now