Updated some component stuff