Intermediary work for code improvement + bug fixes