fixes

there was a label that wasn't matching its autoconnect function, also I fixed some code in your functions to be more effective and conform to our "CodingStyle" :P