Fixed more intends and stuff