fixed all the issues
fixed more issues