Updated with various refactors and fixes.
Updated.
Updated makefile
Release Beta5