added a boss
merged some stuff