fixes and enhancements
added raphael