Fixing things and debugging more