Fixes From Main Author