dynamic stuff on invoice refactored and working pretty well...