More work on the code. Added more for the framework. Miguel. svn path=/trunk/; revision=1593
svn path=/trunk/; revision=1587
svn path=/trunk/; revision=1580