Boss added, small fixes