Added more cool stuff. Fixed missing dependency