Small Fixes. This is a shit code because of the many error and the bad developing