Updates and some smaller fixes