Uploaded latest versions

Some bits before were a bit buggy.  I've fixed them a bit.