polished stuff a little
many improvements
added spinner