Some initial fixes, improvements and preparations...