code clean up, squashed sizeof bug and toast bug
consoladated dependencies