again, many general improvments
more stuff