cleaned up some stuff, bit sample improvement