small fixes (now testing with devices!)