Bug fixes and validation. Removing currently unfinished elements