adding important classes
updated forge
code cleanup