Small updated & housekeeping