Updates/fixes

Here's some updates for you.