- Bugfix threads
 - Small changes