Miscellaneous changes. view stuff improved