get SL working as well, bug fixes