spw6 updates
added some more spw6 things...