almoste done with stone island

need a few pretty fixes