Devel

Minor bugs and problems solved.