Adding several fixes from a while ago (ike); Plus, some fixes from Christian Leutloff (see http://tinyurl.com/5cz67a)