Lot´s of changes for fixing Bugs and improvments etc.