Fixed alotta stuff