Changed entry point declaration, fixed som minor parsing bugs