Upper case in bosses names and some small tweaks