Final, Final Fixes!!! :DDD