* merged from the laptop branch (smallish fixes)