Added .. things.. hopefully will unbreak.. stuff