Import and export menu now optional, others bugs squashing..