added actual drawing functions
added rivet drawing function