Few Changes

Just a Commit for portability on Tower-PC and finishing a day of work