Lots of changes forgot to commit

This is meant to catch up - done Smart, Islands, tourguides listing etc.