You're right, fixed that, rebased to clean up the code