Tweaks, moved back to eclipse.

I couldn't get used to IntelliJ.