Adding bossfight and few changes