minor changes and added libs