Fixed Updated bugs
***THIS VERSION/COMMIT IS NOT FUNCTIONAL***