Bug fixes

Semicolons and stuff