fix a few bugs and white label a little