Development

Some more bugs corrected.