still trying to correct a few things