Many small updates after testing