Fixes, additions, stuff...