More minor changes + main thingy