compilation again!
tests+runs with minor bugs