Unstable

Time to update this branch. It has been awhile with some important fixes.