fixed some minor errors, now everything is clean slate