Added missed items from http://forums.irowiki.org/showpost.php?p=1366277&postcount=624 and http://forums.irowiki.org/showpost.php?p=1367371&postcount=636