Invoice & other improvements