Merge alot of stuff to master