jsPDF added
restructure some crap