Small update, bugfixes