Fixed bad apples, improved the Baron