added more predicaments, still clean-ups