Fixed alot of compiler errors