Formatting
Added logicparser, fixes and tweaks