Library Bug & PEP8 Adherence Fixes