Feature/bill/fix develop

wooo!