fixes/cleanup