Various changes, added boilerplate