SLU fix (works, but could be done more efficiently)
Bugfixes