Bug fixes + Functioning Factories + gui changes