Reinstate old solve() - get() behaviour
Run astyle over *java
Move some packages around.