fixed stupi bugs