plug myself and last fixes