Suguwork

@henryanand @enisoc @alainjobart couple of bug fixes.