Basic project fixed, only minor errors