gists & general cleanup