small changes, added filling