fixes, improvings, removed todo entry