Working on first boss, more improvements