various modifications + fixes