some small changes
works for real - one questionable thing