fixing some more issues. closer now