Feast of the Beast: Bug fixes V 1.0,2

Bug fixes V 1.0,2