Fixes and addages