2009-11-15	Warning removal and improvement of some functionality. No whatsnew.