Added some little things to increase the quality and plugability