Miscellaneous changes

Fixed, thanks