some small fixes
temp mid night commit