Added more recent changes from nodice73 branch