Several updates based on actual use