added bug2
cleanup
optimized too much & broke stuff