I applied your fixes, it should be alright now