still debuging
general improvements/fixes