Added fill bucket function
Fixed some small things