button
some fixes