fixes and additional info