little fixes not commited