changed and added lots of stuff