Rewrites and misc additions