Last commit and bugs. This hopefully solves them