-- fixed random issues, cruft cleanup