Added @Init and fixed a few mistakes regarding modifiers