cleanup, fixes, many more things