fixed some eastwood and bikeshed issues