Small changes and updated forge