small bugfixes, modules feature casual WIP