Fixes and additional information