Refactored things a bit. Actually fix the infinite power thing
Fixed local build.xml that was accidentally commited