48k sample and code cleanup