Initial _s cleanup

Update readme, etc