Hopefully solved a few errors and warnings.