Fixed a few more issues but things are still broken