improved plugin handling
cleanup
updated version info
updated version info