Major fixes, latest rrssb, general clean up.