Exploration, minor bugfix in Perk.java
Merge manually. Ugh...