Bug fixes but there are some more...