Added some doc and removed some hardcoded vars