fixed download and includes