Fixed some class issues, reverted referencing