better naming convention, bug fix for downsampled patch
resolved conflicts