bug fixes
declaring missing static vars
starting to clean up the composer file