A few more changes related to the java 'static' semantics.
Updating/fixing/refactoring code.
Started implementing a constraint solver.