just fixes, please merge