Fix some mistakes, hope it okay okay with travis testing right now