fixed typs and etc