Made some minor changes and fixed some bugs

git-svn-id: http://voronet.francu.com/repos/DEX@1031 8d550267-2627-4c68-899f-85492a8dd5ca