added some websox stuff fixed some things

No merge yet