enhanced a lot of stuff