- More work on several stuff