bug fixing, almost ok now