chore: updated locations, general cleanup, etc.