fixed some great stuff