Kleine fixes, Robert is awesome gaY!