work in progress

 * more stable libraries
 * some refactoring