merged in changes from bsd1 for latest build