Small bug fixes

I'm back for awhile!!