cleanup
added fancy effects