@thyms general improvements, damn small commits.