Merging cleanup & changes from mrzarquon