Random changes and fixes everywhere