Reduced code complexity, improved performance, added support for quite some spots that were missing