Misc fixes and additions

I also merged in darkstars updates for you.