adding a spinner, cleaning up some useless cruft