Fixes lots of issues / new features.