Improvements in station detection && handshake parsing (ugly!)