A few well thought out fixes, and it could be fun.