more bug fixes - still not 100%
reworked state handling in SPP code