Provide map actions

Step-down to Java 6 was also made.
Fix whitespace

I also revert a hunk change due to broken encoding setup