pushing additional fixes for now kinda i guess