Fixed all basic issues

- Also added stuff here and there