Removed softcap and increased point cap.

Left my trait optimizations in place, they fix a few small bugs, and
will make it easier to work with in the future, should anyone need to
mess with it again.