Fixes bugs, everything working now except graphic display and import/export.