some bug fixes, composer support added.