some glue, fix and tricks