added warnings, removed some warts