Fixes and cleanup
Added slns skeleton