Interlocks, stroking, bugs fixed