Some tidy up, proc per row/col now compile time, some fixes