more small fixes very cool