Bug squashing + documentation