Bug fixes, refacts
Added special treatment for SL products