Bug Fixes in Unit6.pm and Additions to Unit5.pm