Organization and fixes