Bug fixes

Everything works!