tighting up things here and there (see main repo)