Third commit - working fill, bugfixes