Fixed some minor bugs

There are still bugs from the presentation