fixed classes and lib loading