More small adjustments + bug