this is all my custom stuff (cstm) and some easy fixes