minor changes and code maintenance
nothing done - everythings messed up