build + some cleanup