9/12

more functions
added nullcheck