updates to base and slight changes