small updates and re-configuration