just some small changes
work in progress