Fixes and alterations