Updated lotsa stuff