Update Paul's Branch

Some changes might be lost and some bugs might have been created