meant to improve this quickly but haven't had the time for it recently, will hopefully get to it soon