Updates to complete 1.4.1