more updates FTW!
updates and fixing a conflict I guess