Add more S3, S4 devices & track own mako kernel...