still doing minor fixes