Besides this thing and some other minor things I've changed in my branch it looks good to me.